[PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

Gbp-Pq: Name Version_2_7_2pre15

diff --git a/cmpnew/gcl_cmpeval.lsp b/cmpnew/gcl_cmpeval.lsp
index 12dd0302fdc2fbc4ab0afd29bedf14d1a6493944..4bdb6c82cd8cdafb2eab2050233f1dbd76f2098b 100644 (file)
--- a/cmpnew/gcl_cmpeval.lsp
+++ b/cmpnew/gcl_cmpeval.lsp
@@ -87,6 +87,10 @@
                  (let ((val (symbol-value form)))
                    (or 
                     (c1constant-value val nil)
+                    (when (functionp val)
+                      (multiple-value-bind (s c n) (fle val)
+                        (declare (ignore c))
+                        (c1function (list (or n s)))))
                     `(location ,(make-info :type (object-type val)) (VV ,(add-constant form))))))
                                        ;                 ((c1var form))))
                  ((c1expr-avct (c1var form))))) ;FIXME pcl

diff --git a/git.tag b/git.tag
index b8af7a535004a4f74288f92074e578c329e52dbc..ec638e139163a18bc2cde361968e997b172aadb9 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre14"
+"Version_2_7_2pre15"

diff --git a/lsp/gcl_iolib.lsp b/lsp/gcl_iolib.lsp
index de10ed108574251a1fbff461aacd494da84a5e13..8abf0fa75299e4a18787e96cc9a8ef5b6ee3abae 100644 (file)
--- a/lsp/gcl_iolib.lsp
+++ b/lsp/gcl_iolib.lsp
@@ -406,14 +406,12 @@
       (d pd (cdr pd)))
     (values ps created)))
 
-(defun get-byte-stream-nchars (s)
-  (let* ((tp (stream-element-type s))(ctp (cmp-norm-tp tp)))
-    (labels ((ts (i) (when (<= i 32)
-                      (if (tp<= ctp (cmp-norm-tp `(unsigned-byte ,(* i char-length))))
-                          i (ts (1+ i))))))
-      (cond ((tp<= ctp #tcharacter) 1)
-           ((ts 0))
-           (1)))))
+(defun get-byte-stream-nchars (s);restricted
+  (let* ((tp (stream-element-type s)))
+    (typecase tp
+       ((cons (member signed-byte unsigned-byte) (cons (integer 0) null))
+        (values (ceiling (cadr tp) 8)))
+       (t 1))))
 
 (defun parse-integer (s &key start end (radix 10) junk-allowed)
   (declare (optimize (safety 1)))

diff --git a/o/print.d b/o/print.d
index c1bdf83b7aab16e31873b0f6a0e156822b84c634..535c7828c48cd70bc2721c8ef351c9917873ac97 100644 (file)
--- a/o/print.d
+++ b/o/print.d
@@ -1068,7 +1068,7 @@ print_symbol_name_body(object x,int pp) {
     write_ch('|');
 
   for (lw=i=0;i<VLEN(x);i++) {
-    j = x->st.st_self[i];
+    j = (uchar)x->st.st_self[i];
     if (PRINTescape && (j == '|' || j == '\\'))
       write_ch('\\');
     fc=convertible_upper(j) ? 1 :